Privatize a few things
Refactor tests for readability
Fix a bug, add a test that caught it
Comments