Improve readme and reduce redundancy