Code guideline changes and changelog addition