Remove bundle ALL option and fix remaining indentation