Readme update
Minor code cleanup