Clean code
Populate modals from JSON
Test