Small optimisation
Optimisation: fixed small memory filler
Minor optimisation in global variable