Refactored less structure