Just cleanup and formatting