refactor: code style improvements and formatting cleanup (#1962)

refactor: code style improvements and formatting cleanup (#1962) #157