refactor, organization