Small code-quality improvements
nothing special
Merge remote-tracking branch 'origin/api'