Refactor code

* collapse short blocks to single line