Moved throttle into class and separate module