accept pull request lang picklist #21 with some minor formmating and translation changes. code cleanup