Code indentation and cleanup of whitespace for travis complaining