Documentation and cleanup