travis and some code clean