Hopefully, the last cleanup. Plus update README