Worked a bit more on commenting