Code review comments from arbesfeld