[REVIEW CLEANUP] Cleanup functions.php

[Resolves #82]