Refactoring to be a bit more object.