Removed unused module Opt, improve type declarations indentation.