Cleaning up formatting and variable names to match ROS/Google style guides.