Reorder language file
Code Style Fixes