Code maintenance and README.md updates