Revert "Flooring towards zero code clarity/maintainability"

This reverts commit deb793ec6e28bc0aeafa3fd013fc55e7e1b14545.