Changes according to code inspection