Cleanup + Fix spelling