UserService, FileService added, lint cleanup