Some refactoring to actually get down to business