Correction padding
Start to clean up
Add comment