Updated README and code cleanup