refactor to better naming, overall cleanup