Some Cleaning up and Improvements