Minor Tweaking/Optimising