improvement of the readability of the code, some adjustments