refactor + add reset script