Refactoring - Kinect