Starting to clean up bookshelf.js