Some cleanup. Fixing paddings.