Refactor to use the lovely cfndsl app

Change-Id: I131cf9d25b878227aa6700c60e6ef59cb30a0b1e