Cleaning up code
Clean code