Minor improvements and cleanup.

  + improve opts parsing and add helper
  + restructure module content
  + use internal opts variable and helper
  + make module a function