diff --git a/.analysis_options b/analysis_options.yaml
similarity index 85%
rename from .analysis_options
rename to analysis_options.yaml
index 1030240..80bb834 100644
--- a/.analysis_options
+++ b/analysis_options.yaml
@@ -2,9 +2,8 @@
 #
 # The commented part below is just for inspiration. Read the guide here:
 #   https://www.dartlang.org/guides/language/analysis-options
-
- analyzer:
-   strong-mode: true
+include: package:pedantic/analysis_options.yaml
+analyzer:
 #   exclude:
 #     - path/to/excluded/files/**
 # linter:
diff --git a/lib/src/client.dart b/lib/src/client.dart
index ac41161..9c45738 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -25,46 +25,44 @@ class Client {
   Decoder decoder;
   List sockets = [];
   Map nsps = {};
-  List connectBuffer = [];
-  Logger _logger = new Logger('socket_io:Client');
-
-  /**
-   * Client constructor.
-   *
-   * @param {Server} server instance
-   * @param {Socket} connection
-   * @api private
-   */
-  Client(Server this.server, Socket this.conn) {
-    this.encoder = new Encoder();
-    this.decoder = new Decoder();
-    this.id = conn.id;
-    this.request = conn.connect.request;
-    this.setup();
+  List<String> connectBuffer = [];
+  final Logger _logger = Logger('socket_io:Client');
+
+  /// Client constructor.
+  ///
+  /// @param {Server} server instance
+  /// @param {Socket} connection
+  /// @api private
+  Client(this.server, this.conn) {
+    encoder = Encoder();
+    decoder = Decoder();
+    id = conn.id;
+    request = conn.connect.request;
+    setup();
   }
 
-  /**
-   * Sets up event listeners.
-   *
-   * @api private
-   */
-  setup() {
-    this.decoder.on('decoded', this.ondecoded);
-    this.conn.on('data', this.ondata);
-    this.conn.on('error', this.onerror);
-    this.conn.on('close', this.onclose);
+  /// Sets up event listeners.
+  ///
+  /// @api private
+  void setup() {
+    decoder.on('decoded', ondecoded);
+    conn.on('data', ondata);
+    conn.on('error', onerror);
+    conn.on('close', onclose);
   }
 
-  /**
-   * Connects a client to a namespace.
-   *
-   * @param {String} namespace name
-   * @api private
-   */
-  connect(name, [query]) {
+  /// Connects a client to a namespace.
+  ///
+  /// @param {String} namespace name
+  /// @api private
+  void connect(String name, [query]) {
     _logger.fine('connecting to namespace $name');
     if (!this.server.nsps.containsKey(name)) {
-      this.packet(<dynamic, dynamic>{'type': ERROR, 'nsp': name, 'data': 'Invalid namespace'});
+      this.packet(<dynamic, dynamic>{
+        'type': ERROR,
+        'nsp': name,
+        'data': 'Invalid namespace'
+      });
       return;
     }
     var nsp = this.server.of(name);
@@ -227,7 +225,7 @@ class Client {
 
     // `nsps` and `sockets` are cleaned up seamlessly
     if (this.sockets.isNotEmpty) {
-      new List.from(this.sockets).forEach((socket) {
+      List.from(this.sockets).forEach((socket) {
         socket.onclose(reason);
       });
       this.sockets.clear();
diff --git a/lib/src/namespace.dart b/lib/src/namespace.dart
index 19fd449..1e2f741 100644
--- a/lib/src/namespace.dart
+++ b/lib/src/namespace.dart
@@ -19,18 +19,14 @@ import 'package:socket_io/src/server.dart';
 import 'package:socket_io/src/socket.dart';
 import 'package:socket_io/src/util/event_emitter.dart';
 
-/**
- * Blacklisted events.
- */
+/// Blacklisted events.
 
 List<String> events = [
   'connect', // for symmetry with client
   'connection', 'newListener'
 ];
 
-/**
- * Flags.
- */
+/// Flags.
 List<String> flags = ['json', 'volatile'];
 
 class Namespace extends EventEmitter {
@@ -38,70 +34,63 @@ class Namespace extends EventEmitter {
   Server server;
   List<Socket> sockets = [];
   Map<String, Socket> connected = {};
-  List fns = [];
+  List<Function> fns = [];
   int ids = 0;
   List rooms = [];
   Map flags = {};
   Adapter adapter;
-  Logger _logger = new Logger('socket_io:Namespace');
-
-  /**
-   * Namespace constructor.
-   *
-   * @param {Server} server instance
-   * @param {Socket} name
-   * @api private
-   */
-  Namespace(Server this.server, String this.name) {
-    this.initAdapter();
+  final Logger _logger = Logger('socket_io:Namespace');
+
+  /// Namespace constructor.
+  ///
+  /// @param {Server} server instance
+  /// @param {Socket} name
+  /// @api private
+  Namespace(this.server, this.name) {
+    initAdapter();
   }
 
-  /**
-   * Initializes the `Adapter` for this nsp.
-   * Run upon changing adapter by `Server#adapter`
-   * in addition to the constructor.
-   *
-   * @api private
-   */
-  initAdapter() {
-    this.adapter = Adapter.newInstance(this.server.adapter, this);
+  /// Initializes the `Adapter` for this nsp.
+  /// Run upon changing adapter by `Server#adapter`
+  /// in addition to the constructor.
+  ///
+  /// @api private
+  void initAdapter() {
+    adapter = Adapter.newInstance(server.adapter, this);
   }
 
-  /**
-   * Sets up namespace middleware.
-   *
-   * @return {Namespace} self
-   * @api public
-   */
-  use(fn) {
-    this.fns.add(fn);
+  /// Sets up namespace middleware.
+  ///
+  /// @return {Namespace} self
+  /// @api public
+  Namespace use(fn) {
+    fns.add(fn);
     return this;
   }
 
-  /**
-   * Executes the middleware for an incoming client.
-   *
-   * @param {Socket} socket that will get added
-   * @param {Function} last fn call in the middleware
-   * @api private
-   */
-  run(socket, fn) {
+  /// Executes the middleware for an incoming client.
+  ///
+  /// @param {Socket} socket that will get added
+  /// @param {Function} last fn call in the middleware
+  /// @api private
+  void run(socket, Function fn) {
     var fns = this.fns.sublist(0);
     if (fns.isEmpty) return fn(null);
 
     run0(0, fns, socket, fn);
   }
 
-  static run0(idx, fns, socket, fn) {
-    return fns[idx](socket, (err) {
+  //TODO: Figure out return type for this method
+  static run0(int index, List<Function> fns, Socket socket, Function fn) {
+    return fns[index](socket, (err) {
       // upon error, short-circuit
       if (err) return fn(err);
 
       // if no middleware left, summon callback
-      if (!fns[idx + 1]) return fn(null);
+      if (fns.length < index + 1) return fn(null);
 
       // go on to next
-      run0(idx + 1, fns, socket, fn);
+      run0(index + 1, fns, socket, fn);
     });
   }
 
@@ -116,30 +105,26 @@ class Namespace extends EventEmitter {
 //        to(name);
 //    }
 
-  /**
-   * Targets a room when emitting.
-   *
-   * @param {String} name
-   * @return {Namespace} self
-   * @api public
-   */
-  to(String name) {
-    rooms = this.rooms?.isNotEmpty == true ? this.rooms : [];
-    if (!rooms.contains(name)) this.rooms.add(name);
+  /// Targets a room when emitting.
+  ///
+  /// @param {String} name
+  /// @return {Namespace} self
+  /// @api public
+  Namespace to(String name) {
+    rooms = rooms?.isNotEmpty == true ? rooms : [];
+    if (!rooms.contains(name)) rooms.add(name);
     return this;
   }
 
-  /**
-   * Adds a new client.
-   *
-   * @return {Socket}
-   * @api private
-   */
-  add(Client client, query, fn) {
-    _logger.fine('adding socket to nsp ${this.name}');
-    var socket = new Socket(this, client, query);
+  /// Adds a client.
+  ///
+  /// @return {Socket}
+  /// @api private
+  Socket add(Client client, query, Function fn) {
+    _logger.fine('adding socket to nsp ${name}');
+    var socket = Socket(this, client, query);
     var self = this;
-    this.run(socket, (err) {
+    run(socket, (err) {
       // don't use Timer.run() here
       scheduleMicrotask(() {
         if ('open' == client.conn.readyState) {
@@ -166,83 +151,72 @@ class Namespace extends EventEmitter {
     return socket;
   }
 
-  /**
-   * Removes a client. Called by each `Socket`.
-   *
-   * @api private
-   */
-  remove(socket) {
-    if (this.sockets.contains(socket)) {
-      this.sockets.remove(socket);
+  /// Removes a client. Called by each `Socket`.
+  ///
+  /// @api private
+  void remove(socket) {
+    if (sockets.contains(socket)) {
+      sockets.remove(socket);
     } else {
       _logger.fine('ignoring remove for ${socket.id}');
     }
   }
 
-  /**
-   * Emits to all clients.
-   *
-   * @return {Namespace} self
-   * @api public
-   */
-  emit(ev, [dynamic arg]) {
-    if (events.contains(ev)) {
-      super.emit(ev, arg);
+  /// Emits to all clients.
+  ///
+  /// @api public
+  @override
+  void emit(String event, [dynamic argument]) {
+    if (events.contains(event)) {
+      super.emit(event, argument);
     } else {
       // @todo check how to handle it with Dart
       // if (hasBin(args)) { parserType = ParserType.binaryEvent; } // binary
 
-      List data = arg == null ? [ev] : [ev, arg];
+      // ignore: omit_local_variable_types
+      List data = argument == null ? [event] : [event, argument];
 
-      Map packet = {'type': EVENT, 'data': data};
+      final packet = {'type': EVENT, 'data': data};
 
-      this
-          .adapter
-          .broadcast(packet, {'rooms': this.rooms, 'flags': this.flags});
+      adapter.broadcast(packet, {'rooms': rooms, 'flags': flags});
 
-      this.rooms = null;
-      this.flags = null;
+      rooms = null;
+      flags = null;
     }
   }
 
-  /**
-   * Sends a `message` event to all clients.
-   *
-   * @return {Namespace} self
-   * @api public
-   */
-  send([args]) {
+  /// Sends a `message` event to all clients.
+  ///
+  /// @return {Namespace} self
+  /// @api public
+  void send([args]) {
     write(args);
   }
 
-  write([args]) {
-    this.emit('message', args);
-    return this;
+  void write([args]) {
+    emit('message', args);
   }
 
-  /**
-   * Gets a list of clients.
-   *
-   * @return {Namespace} self
-   * @api public
-   */
-  clients(fn([_])) {
-    this.adapter.clients(this.rooms, fn);
-    this.rooms = [];
+  /// Gets a list of clients.
+  ///
+  /// @return {Namespace} self
+  /// @api public
+  ///
+  /// TODO: Fix this description or code. Add type parameters to [fn([_])]
+  ///
+  Namespace clients(fn([_])) {
+    adapter.clients(rooms, fn);
+    rooms = [];
     return this;
   }
 
-  /**
-   * Sets the compress flag.
-   *
-   * @param {Boolean} if `true`, compresses the sending data
-   * @return {Socket} self
-   * @api public
-   */
-  compress(compress) {
-    this.flags = this.flags.isEmpty ? this.flags : {};
-    this.flags['compress'] = compress;
-    return this;
+  /// Sets the compress flag.
+  ///
+  /// @param {Boolean} if `true`, compresses the sending data
+  /// @api public
+  void compress(compress) {
+    flags = flags.isEmpty ? flags : {};
+    flags['compress'] = compress;
   }
 }
 
diff --git a/lib/src/server.dart b/lib/src/server.dart
index de7c42c..0c154f1 100644
--- a/lib/src/server.dart
+++ b/lib/src/server.dart
@@ -389,7 +389,7 @@ class Server {
    * @api public
    */
 
-  of(name, [fn]) {
+  Namespace of(name, [fn]) {
     if (name.toString()[0] != '/') {
       name = '/' + name;
     }
@@ -408,7 +408,7 @@ class Server {
    *
    * @api public
    */
-  close() {
+  void close() {
     this.nsps['/'].sockets.forEach((socket) {
       socket.onclose();
     });
diff --git a/pubspec.yaml b/pubspec.yaml
index ccc9e0c..def1d98 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,8 +1,10 @@
 name: socket_io
 description: Dartlang port of socket.io
-version: 0.9.0+2
+version: 0.9.1
 author: jumperchen <jumperchen@potix.com>
 homepage: https://www.zkoss.org
+repository: https://github.com/rikulo/socket.io-dart
+issue_tracker: https://github.com/rikulo/socket.io-dart/issues
 
 environment:
   sdk: '>=2.0.0 <3.0.0'
@@ -11,5 +13,7 @@ dependencies:
   stream: any
   socket_io_common: any
   uuid: any
+
 dev_dependencies:
   test: ">=1.3.0 <2.0.0"
+  pedantic: ^1.9.0