formatting, cleanup