LIttle bit more reorginazation
Or I guess that too