jsx-style hashes and some cleanups

Please, consider applying/cherry-picking if found feasible.
TIA,
--Vladimir