Code cleanup
update README