Refactoring, trying to remove utility methods.