Commented less file a bit...
Refactor & fix JSHint errors...