Tidy up loader and common requires and config param