Update README. Code cleanup