Small OCD style fixes