Fix ALL the code
Minor cleanup
Merge pull request #1 from jzhu98/ReorganizeCode

Fix ALL the things