Readme update
Cosmetic changes and code clean up