Improved Lamvak's pull request

Add changes from comments