[test] cleanup
[fix] simplify comment method
[minor] retain complex conditionals, fixes #29