[ issue-1252 ] Minor revision

* Added type signatures
* Fixed typos
* Cosmetic changes
* Fixed indentation
Merge branch 'maint-2.4.0'