Being more explicit in the code

- as requested by a code review