Some general clean up