Refactor dattt