systems refactor