Slightly less redundant logic