FLOE-194: Some code improvements.