Fixes for style updates done by google code search
Keeping up with google code search team.