Added travis, small refactors