style fixes and remove the silly pass___ options