Little reorganization

Now just simplier