Coding style fixes
Merge branch 'soft-cascade-delete' into nexylan