code cleanup for soulmate