Ergonomic changes

I organised code