minor structure changes
Merge pull request #2 from GARI3AGE/patch-2

minor structure changes