Post code review - some minor cosmetic changes