Updated README and clean-up