Minor style cleanups in /core folder