System spec & class refactoring