Staging
Merging
PEP-8 formatting