Fixed VRF attribute and various cleanups

Did some cleanup of... things and corrected the setting of the VRF
attribute when adding new prefixes.