additional cosmetics and minor issues fixes
This will create a new commit in order to revert the existing changes.
