adjusted to the coding standard