Cleanup
Usage of streams for common interface