fixed indentation and removed trace output