Improved readability and added missing property.