style: make inline fn's consistent
style: make inline fn's consistent

Merge branch 'develop'

* develop:
  style: make inline fn's consistent