+ refactor

change names
more modularity...