cleaning & reformatting
same