Changed some codes, to make them shorter