refactor; clean up