(maint) refactor