Add chnages to code, style files