Small cleanup for helper functions
Merge branch 'master' of https://github.com/ivanovsaleksejs/Xn_pls