Updates for style and 1.2 syntax