FLOE-171: Added comments as well as code improvements.