Code review: Simpler prop syntax and removed a function