Rearrange over18 logic