Revert "Small changes to improve readability"

This reverts commit d0d9ff7850bcdf76c0ac85f8f87cf06289435b33.