readme and code cleanup