Minor display improvements & code simplification.