refactor to remove code that generates warnings
Merge branch 'master' of github.com:nathanrharris/MyNGL