Clean up syntax, freshen travis build