Clean code

- Clean code,  theres still code to comment and improve