Cleanup after @bjoernhaeuser feedback