Adapting code to conventions