FLOE-164: Code improvement and styling fix.