More of refactoring