refactor again, mati no me mates