FLOE-195: Added comments and code clean up.