these two lines could be merged