I'll declare a constant for each function name

Good catch on the isset mistake - I didn't fix these up after I reworked it slightly.  We actually want ```empty()``` as opposed to ```!empty()```.