Few things for clean and reorganize
remove ~