Minor cosmetics changes