Formatting and removing dummy classes