Code cleanup and travis