PMD-Warnings - reduced function size
Merge pull request #78 from kazoompa/magma-1.8.x-local

PMD-Warnings - reduced function size