Issue #2: Change  to  and other semnatic improvements.