Some final modifications to clean up the code and wrap the throttling up.