cleanup
more cosmetics