Updated Canonicalized, fixed comments