Cleaned up swap string padding