FLOE-194: Code improvements.