refactor, clean up verbage