More tidying up of boot.js