LESS Refactoring

Submitting this as a pull request so it can get tracked the usual way :)