Beautifications for tab size 8

Beautifications for tab size 8