cleanup and formatting