Cleaning up thanks to Marionette advice