Cleaning up the main mod class