#660: Applied code review comments