Refactored feature
Updated formatter