further formatting improvements