readme and more code cleanup