Use one call to .attr instead of two and linebreak consistency

Follow-up to: I2b937eba605b7e6a98612a02c75eb9e7f347752

Change-Id: I45254ad2fee63918763cc7662523b80c26418177
Merge "Use one call to .attr instead of two and linebreak consistency"