minor Refactor