README update and minor code cleanup