Refactoring complete. Onwards and upwards