Update README.me and code cleanup