Improve messages and notation