Tad bit of refactoring