cleanup plain formatter, add test