cleaning trash
Proper structure up