Initial Cleanup

Removed comments from Main class