Tidied up the mod class