Clean
A couple adjustments - let's not lazy load field attributes through the assignment