Some more cleaning up :)