Improved the DocBlocks and other code cleanup

Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
Merge pull request #1320 from ravage84/docblock-improvements

Improved the DocBlocks and other code cleanup