Sane scopes

@katiekatieb 
I converted the scopes to be more readable, in preparation for adding downvote implementation. If you like this, can you merge it in?