name change for simplicity
code cleanup and refactoring