Isolate everything in the library
Remove dead code
Change syntax slightly
Result: Better library
Merge remote-tracking branch 'origin/master'