Cleanup and extended readme