Cleanup and added interface to help deal with ring complexity