Fixed more Option.get(). Fixed cyclomatic complexity.