Revert "Revert "Small changes to improve readability""

This reverts commit 0d6e77f6c5428d724e9ebdbb0c9fed1624fbdff1.