SPLEVO-340
If-Else Refactoring With Static Configuration Class

-code cleanup
-bugfixes
-refactoring changes
-updated tests