removed commented code and cleaned up comments in general