cleanup a bit more even
merge more stuff
last refactor