Clean up and change references to fields
Remove font-weight on 'name'