Was refactoring code