Reordered visitor functions to match initializer. Removed duplicate and swp files