Cleaned up Motor.h and Motor.cpp