Core: Cleanup: Minor style fixes