Some refactors
Merge branch 'master' of github.com:SerafimArts/Less