simplified some code, hopefully fixed travis