Better prop names
Remove redundant parent references