Ups, style the loader and remove before I jump branches here