cleanup and doc update