More tidying - bootstrap