Refactored;format