moar cleanup
Finishing touches