Refactor and comments added to fields