Major overhaul/cleanup
More cleanup
Fixs/Cleanup