Finished cleanup/formating