Cleaner Code

Cleaner Code