Refactor general logic in pop.py, including removing the class
file pidgeon.py.