Small refactor;