Some cleanup :)