Refactor to use stream API