* more readable
* small visual corrections