Improve code & language style