refactor/cleaup