Some changes after code inspection