Refactored some code
Refactored some code

typus/typus,wollzelle/typus,brainsome-de/typus,baban/typus,chiragshah/typus,chiragshah/typus,wollzelle/typus,thirdthing/typus,readyfor/typus,burn-notice/typus,baban/typus,readyfor/typus,chiragshah/typus,baban/typus,readyfor/typus,chiragshah/typus,readyfor/typus,typus/typus,brainsome-de/typus,burn-notice/typus,burn-notice/typus,burn-notice/typus,brainsome-de/typus,baban/typus,thirdthing/typus,typus/typus,brainsome-de/typus,wollzelle/typus,thirdthing/typus,typus/typus,wollzelle/typus,thirdthing/typus