Just some general clean up.