Minor clean-up and some additional comments