Extracted variable setting into a method
Merge branch 'master' of github.com:spike01/mapp