Small doc and cleanup