Looks really good :) if you want to clean up the main function you can try adding a dwpwndancy injection framework such as UberFx.
Good luck!!