Cleaning up a bit int main.cpp