EAGLESIX-2712: minor changes and comments