Bit of refactoring

SYNR-639