Eliminating lines of code for simplicity

Signed-off-by: bpotterschipul <bpotter@schipul.com>