Refactored and tested a lot of functionality in Users and Streams