cleanup build and format