Improved comments and removed some unneeded functions

Remaining: functions currently being called that can be rewritten