Cleanup: Minor style fixes