Keep code formatting as before