Changes according to remarks from code review