started doing some refactoring, again.