updated code cosmetics