Updated readme and tried to make classes clean up after themselves