Small refactering.