Fix #325 Centrifuge dupe bug
Minor code cleanup