v1.3.1

* Cleanups in the header and implementation files