Small code cleanups and Readme updates