REFACTOR 

:baby_chick: