cleanup and styling