keep refactoring, changed format and made sure all current specs are passing.