- refactoring to stream API
 - formatting