Better commentary, tests