Small Raritan refactor