increasing readability and some other improvements