english lang and some code formatting improvements