doing some refactoring before I introduce the next new feature;