Addressing @sethladd's comments