misc vacation refactoring