Documentation and Cleaning up