Improve code and README.