More refactoring
WHOOO MORE AND MORE DRY
typooo
typo