Renaming cleaning script + formatting changes