Removing redundant code, added additional log data, #262.

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>