Adjusted to code convention