General cleanup and grouping of pre and code rules.