Refactoring, rework how <mode> is specified in the Verilog Signed-off-by: David Shah <davey1576@gmail.com>