adding a container and basic tidying