readme update, code cleanup