Refactor some fields