Small changes to failure logging
Some style changes