Refactor details