Refactor/field with id

Can you remove some of this newlines?