Move some things out of the main class.
It makes more sense for them to be in the place they are used the most.