Style tweak
Fixing FK clashes