Squash me: Tidy up backend

Authored by davidedmundson on May 18 2018, 8:51 AM.