more code cleanup. Updated readme