A bit of linting and performance optimising
Merge branch 'master' of github.com:ChrisMurphyMicros/ShellPATP