Updated to the latest style