removes hard coded variables
Merge pull request #60 from aaromp/style

removes hard coded variables