Refactored employment and college