adding cvasilak code review comments