cleanup and beautified
pathes corrected