documentation expand and cleanup