FLOE-195: Some code improvements.