Some code cosmetics