Refacto class
Update update function + README SO FRESH