Rework according to code review comments