Fix paddings and style of code