code cleanup, readme updates