Assortiment of cleanups and comments around the backend