Cleaned up kinematics and added comments