Fix formatting as per project style