Some more clean up. Try to make the footprint small :four_leaf_clover: