Minor changes suggested after in-team Code Review