- beautified code
- fixed relations