Refactoring after SimeonC's comments