Reworking some existing code
Updated readme file