Complete Overhaul
Fix whitespace errors