Some code style cleanups