Minor code style clean-up