readme update and code cleanup