Minor code style refactor