Updated to match new coding styles.