minor style changes to make stream a little bit cleaner