Some cleanup with the code