Refactoring. -Jon