CAPX-84 | Some more formatting