Minor refactoring
Merge branch 'master' of github.com:leonz132/laz