#56 Updated documentation of Container

Also modified a few local variable names to be more consistant