formatting
merged
add trace level
spaces
add trace level