Cleaning up Broker CRUD

More to come.
Resolved Conflicts & More Style Updates