Refactor feels at a good state