Cleaned up main mod class