Did some code cleaning in data management...
Merge remote-tracking branch 'origin/master'