refactoring done? travis?