some style tweaks
tweaks to container arg