cleanup a bit & format