Code corrections after code inspection