Refactor using cliff

Change-Id: Iffb8fb12176eb339e7d815670893e46818ffac02
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>