cleanup on formatting