Minor amendments & cleaned up comments