Tidy extended containers code for pep8 + clarity.