self-review: code cleanup