First step in simplifying the code
Improved README