Apply code review suggested changes by @joschi