dev-AMEC-1936 code review changes