Tweaked encoder style