Shortened some comments and removed commented code.