Some minor performance improvement