Update the format to follow b2g style