removed hardcodings
Merge pull request #3 from adjust/tidy_up

removed hardcodings