More clean up and some changes