Made compliant with google's cpplint.py