Clean up, update README