clean up logic based on answered assumption
Merge branch 'master' of https://github.com/jay3686/peloton-test