Get Travis running & refactor