Include source-map dependency

.. plus some minor cleanup as well