fixed based on code review comments