more simplification
moves some code
cleaning