Code organizing

not much