removes unused code and removes hard-coded variables
changed styling
Merge pull request #45 from aaromp/style

Style