more code cleanup
Merge branch 'dev' of github.com:legworkstudio/Legwork2012 into dev