Small cleanups

Reviewer: @sgomes