Fix indentation and prefer collect