Cleaning up some methods, comments. Left some comments for later debugging.