changed around variable names and formatting
Merge branch 'master' of https://github.com/E100-PEAR/e100