Clean code

Clean code