Minor code style refactoring