refactor away ...