Reworked Parameter in Main

Also fixed the coding style in main as it was bugging me.