Refactoring: fix formatting for readability