* Organized imports * Minor code cleanup * Updated English locale file.
Requires MIGRATION if upgrade from older version.