#27 minor changes of code for higher readability