formatting
improved logging