Clean up main.h a bit