A bit of refactoring and a bit of fitness.