Clean up CustomScrollViewController

Goodbye to commented-out code and weird whitespace.