Remove uglinesses in the code