Clean up code. Now with hoverdrive!