comment cleanup
Fix padding logic