Clear code and comments