some more clean up :)