refactoring of static maps code

* fix names, documentation and null check