Some General clean up