EAGLESIX-2653: Reformat and use proper dependencies

Mostly cosmetic changes, added tags in clone.