Final code cleanup

Removed some code that was there fore debugging, cleaned up comments