Improving Less 1.4 compatibility and code cleanup