Some code enhancement according to parkouss' advices
Some code enhancement according to parkouss' advices