[clean] cleaning after code review w/ @blandinw