Refactored less