k time to refactor dis