Clean, working, small refactoring