Refacto and Travis fix (failed because of timestamp)