Minor update (0.6.2)

Updated CLI to use language file
Reformatted several functions