Fixed all the pull request comments and cleaned up
Merging madness