no need to use new anymore and couple of minor comment updates