Could this be merged with the above if clause via &&?