Cleaned up Comments and Useless Code