minor cleanup of swizzler
added feature as requested in ticket #224