More code optimizations
Merge branch 'master' of github.com:EchoCST/ReferenceSolutions