* some minor cleanup