Removed inefficiency