Main.cpp is now more GNU-style