Remove extra comma and clean up code alignment

Change-Id: I9d68564fb158295a1cac63b878738eb2ed659e51
Merge "Remove extra comma and clean up code alignment"