No functionality changes. Just refactored to make init smaller
No functionality changes. Just refactored to make init smaller

janga1997/Patterns,janga1997/Patterns,janga1997/Patterns,garbas/Patterns,garbas/Patterns,garbas/Patterns