Tidying Common module classes