Cleaned up RobotTemplate