Optmise code and increse use of objects