Small cleanups to the code style to make in consistent.