MotionTracker coding stadard cleanup