minor edit and consistency changes