Cleaned up code; deleted unecessary comments