fixing style for several core files