Minor code style clean-up

This change intends to clean-up some of the code style.