Optmise code and increse use of objects
Optmise code and increse use of objects