Stop passing instance variable around

Signed-off-by: Aram Price <aprice@pivotallabs.com>
Add default for logger arguments

Signed-off-by: Aram Price <aprice@pivotallabs.com>