Did some more clean up