Cleaning DB Handling
Reorganized table file