Removed final from mod instance, and reformated a couple lines