Code cleanup + new function to remove special character in folder name
Order by added and some useless attributes commented