Improve performance through reducing option loops