fixing readme and slight code cleanup