Optimising the awesome bubble cannon and tidying