MAJOR comment and indentation cleanup.