More notation and language cleanup