Cleaning code and README.md