Fixed dead link
Consistency + code cleanup
Merge pull request #5 from Hydrothermal/master

Janitorial contributions