cleanup based on self-code-review