[CLEANUP] Let's make the code sane.