Minor clean-up plus adding comments