proper function names
inital refactor step