Little bit of refactoring out some methods