minor beautifications
reverted some finalisations