FLOE-211: Code clean up and improvement.