Some more code clean up and fixed a bunch of typo's