Fixed small coding standards issues