Refactoring out obsolete code and updating log information

![log knockout](http://media1.giphy.com/media/aWIEhVB0QvFKM/200.gif)

Some minor refactoring out of obsolete code and updating logs to be a little more explicit

## Bonus GIF

Wanted to use http://media1.giphy.com/media/pyl1E9trnmwdW/200.gif but it was too big (12mb)