- Refactors interfaces to be simpler