Travis support and cleaned up some of the code