- Change naming from trailing underscore to leading to conform to local conventions
- Complete removal of ‘container’ property (unused in design) (remove commented out code)