armani: code cleanup

Change-Id: Ibeae30cab2d9d68990ba56b82e41762ac8ed0747