Use a different stream option to see if it works with Travis
Code cleanup