Code Review/small refactoring
Merge branch 'master' of https://github.com/Sw2PrGen/PrGenerator.git
Merge branch 'master' of https://github.com/Sw2PrGen/PrGenerator.git
Code Review/small refactoring