FSI code tidied up

Tracker item: 2293