Minor updates.

Code style convention related updates.