code cleanup and updates to README