Removing comment
Clean code and moving code to make changes