Language cleanup and formatting