Update README and code cleanup