DATAES-46 - Apply code formatting