Petites modifications - clean code