Less is now optional throughout uncommenting in the header and functions