Let's clean this thing up