Updated to conform to style conventions.