Tweaks, refactoring and informative README