Clean Up code and comments