Cleaned up swap statement