Refactor docblocks
Rename and reorganize some vars