formatting and clenaup