Amends GS 14-7.1, concerning the definition of a felony offense for the purpose of declaring individuals to be a habitual felon, providing that (1) an offense that is a felony and committed under the laws of another state and for which a guilty plea entered or a conviction returned, (2) an offense that is a crime under the laws of another state that does not classify any crimes as felonies but that are punishable by imprisonment for more than a year in state prison and for which a guilty plea has been entered or a conviction returned, and (3) any offense that is a felony under federal law are considered felony offenses for the purposes of determining if an individual is a habitual felon. Makes clarifying and organizational changes.