context menu cleanup - fixed nits.

TBR: @ussuri