Doing some more clean up :)