Extra improvements based on comments