added less and refactored code