Bring code into standard