Fixes remarks from code review