fixed pub/priv display
code cleanup