cleaning & removing & renaming for #40 #70