Simplification - remove cumbersome Opts struct