[All] Formatting and cleanup