minor code changes
Merge branch 'master' of git@github.com:ruddyadam/prometheus.git