general style fixes