Readme updates + code cleanup.