README update and more code cleanup