Minor changes to match coding conventions.