Add some code cosmetics