Some improvements based on Garcia's suggestions.