Cleaned up some comments and got rid of some commented code.