minor fix and cosmetics