Fixed requirements in comment
Object-oriented refactoring