Small refacturing changes.