Working on thorough commenting