Bug 8570 follow-up removing tabs & improving indentation