Improved code formatting
Relationship field fix (#156)