cleaned up code, update readme