Beautification

Test Plan:
<see below>
Fix for and/or
Test Plan:
<see below>