bootstrap less correct import and bit of cleanup