Fixing some code styling problems to resolve travis-ci problems.