Started a cleanup effort using Google's cpplint script