Simplified/more readable code