Revert "conveniences to use, looks like code obfuscation"

This reverts commit 7ebd86130a845f533454833c385083f5710465f2.