Cleaning up code
Updated readme