CLEANUP THE DAMN CODE