Refactored Code + Improve Travis File