Fixed according to code review feedback