refactor completed! (Ante geiaaaaaaaaa!!)