Minor tweaks.
Use familiar forms