More code clean up and fixed typos
Updated Readme formatting