Add missing use statement and use one line for each

Change-Id: I5ed83bfced9be1da8e1ba00cedc92da68f2082c9