more code cosmetics