Refactoring
Fix formatting