cleaned up structures, stuff is yet working