Clean and docs improve