VID-1240 Fixed formatting, improved Fluent usage, provided default return value