Formatted some classes, its neater now