Main.cpp formatting/minor cleanup

Please review these commits, mischa