code cleanup; update readme