Cleaner code in wheel handler
Removed lot of stuff to cut down to word limit, plus misc fixes