Cleaned up source code

There should be no changes to actual functionality.