bugfixes:
        - Fixed some PSlint warnings