Updated docblocks
Reorganized scope normalization