cleanup/formatting, now we can start real work -sG