5/15 Class Refactoring