EB-4535: Code Clean up
EB-7159: Red error message bug fixed