Made containers package pep8 compliant.