-Finished mysql loading
-More code cleaning