Little cleanup + Added travis