README update and code cleanup