Refactoring: general cleanup and minor documentation added to README.md