Add more specific logging
Remove unhelpful logging, extract method