code-cleanup (part 2)