Adjusted to Coding Guidelines