Code cleanup and travis

Once the build passes this should be good to review and merge