Little cleanup and travis update