small refactoring, added User and #uploader documentation