Adding doc and cleanup