some more cleaning up :B