clean up formatting, and use of discrims