Code style changes and formatting optimized
Merge conflicts