Minor changes, added extra comments