armani: code cleanup

Change-Id: If7d05fb1b0eaf25bf7ebfd8a8fc709ce8eb4401c