De-Kluge

Removed as many kluges as I could find and fix
Made things better
Cleaning stuff up