338 - clean and renaming