Added formatting utility and applied to project