I think this is cleaner, and it should make it easier to maintain this code. Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>