minor changes

- minor polish
- readability improvements