Neatening the code and fixing typos, general clean up
Neatening the code and fixing typos, general clean up