Made a miniscule bit of structure in the functions.
Revert "Made a miniscule bit of structure in the functions."

This reverts commit 2075c24919b253aab14d7a0be71b5deefb5691ea.
Made a miniscule bit of structure in the functions.