Refactoring, more testing around badly formed Classes