Starting cleanups, changing README