Clean up common.py
Merge pull request #7 from hacking-thursday/enhance/clean-up-common

Confirmed.