Style consistency
Refactor: enhance readability