Changed indentation and log statements