[Cleanup] Insert spaces after keywords