Cleanup: simplified passing props
Cleanup: removed some unnecessary props