Refactor profile