Updated to use the latest conding standard.