Simplified & commented code