Some code cleanup. Try using travis