Cleaner Code

Clean code