Code cleanup

Cleanup of some style files.