Major README and code cleanup