General refactoring.
Add message to readme