Optimization of code by Stuart Sim - View it on GitHub