refactor nits