Clean code 2

Clean code 2