REFACTOR - code fix format