1. Replacing arrays with streams
2. Cleaning the solution - removing unused files