Cleans up and finishes commenting code