Jose Salvador: small improvements and clean up