Updated comments and cleaned up some code.