Big code style update