Refactor classes to match the default pattern