Remove global reference to improve performance