address code review comments from brooklyncentral/brooklyn#1464 - mainly tidying up names and logging