More improvements to fix up the notation to align with the conventions