Slightly faster & simpler code