further formatting fixes