Update code formatting

Change-Id: I5646c6cf69d1385ada6b64efc47413807735a32b
Remove duplicate padding statement

Change-Id: Ieb8590718293097766fe6f3c852b4dc57a574418