Fixes cpplint errors, over the shoulder review by @larkost