refactor container properties to share more code
Merge pull request #41 from dannyroberts/refactor-container-properties

refactor container properties to share more code