Major style fixes;