Changed some codes format