MIL-477 handled code review comments